diff --git a/tests/codeigniter/helpers/captcha_helper_test.php b/tests/codeigniter/helpers/captcha_helper_test.php
index 4fbda2a88f..fc86305 100644
--- a/tests/codeigniter/helpers/captcha_helper_test.php
+++ b/tests/codeigniter/helpers/captcha_helper_test.php
@@ -4,7 +4,7 @@
 
 	public function test_create_captcha()
 	{
-		$this->markTestIncomplete();
+		$this->markTestSkipped('Cant easily test');
 	}
 
 }
\ No newline at end of file
diff --git a/tests/codeigniter/helpers/cookie_helper_test.php b/tests/codeigniter/helpers/cookie_helper_test.php
index 3c7c9fd..fba68f2 100644
--- a/tests/codeigniter/helpers/cookie_helper_test.php
+++ b/tests/codeigniter/helpers/cookie_helper_test.php
@@ -19,7 +19,7 @@
 			'foobar'
 		));*/
 
-		$this->markTestIncomplete('Need to find a way to overcome a headers already set exception');
+		$this->markTestSkipped('Need to find a way to overcome a headers already set exception');
 	}
 
 	// ------------------------------------------------------------------------
@@ -53,7 +53,7 @@
 			'my_cookie'
 		));*/
 
-		$this->markTestIncomplete('Need to find a way to overcome a headers already set exception');
+		$this->markTestSkipped('Need to find a way to overcome a headers already set exception');
 	}
 
 }
\ No newline at end of file
diff --git a/tests/codeigniter/helpers/download_helper_test.php b/tests/codeigniter/helpers/download_helper_test.php
index b41a853..d2b42e4 100644
--- a/tests/codeigniter/helpers/download_helper_test.php
+++ b/tests/codeigniter/helpers/download_helper_test.php
@@ -4,7 +4,7 @@
 
 	public function test_force_download()
 	{
-		$this->markTestIncomplete();
+		$this->markTestSkipped('Cant easily test');
 	}
 
 }
\ No newline at end of file
diff --git a/tests/codeigniter/libraries/Upload_test.php b/tests/codeigniter/libraries/Upload_test.php
index d79a3ff..b4ef7bb 100644
--- a/tests/codeigniter/libraries/Upload_test.php
+++ b/tests/codeigniter/libraries/Upload_test.php
@@ -18,9 +18,9 @@
 		$this->_test_dir = vfsStreamWrapper::getRoot();
 	}
 
-	function test_do_upload() 
+	function test_do_upload()
 	{
-		$this->markTestIncomplete('We can\'t really test this at the moment because of the call to `is_uploaded_file` in do_upload which isn\'t supported by vfsStream');
+		$this->markTestSkipped('We can\'t really test this at the moment because of the call to `is_uploaded_file` in do_upload which isn\'t supported by vfsStream');
 	}
 
 	function test_data()
@@ -75,7 +75,7 @@
 	{
 		$this->upload->set_max_filesize(100);
 		$this->assertEquals(100, $this->upload->max_size);
-	}	
+	}
 
 	function test_set_max_filename()
 	{
@@ -87,7 +87,7 @@
 	{
 		$this->upload->set_max_width(100);
 		$this->assertEquals(100, $this->upload->max_width);
-	}	
+	}
 
 	function test_set_max_height()
 	{
@@ -181,7 +181,7 @@
 		$this->upload->file_type = 'image/gif';
 		$this->upload->file_temp = 'tests/mocks/uploads/ci_logo.gif';
 
-		$this->upload->max_width = 10;		
+		$this->upload->max_width = 10;
 		$this->assertFalse($this->upload->is_allowed_dimensions());
 
 		$this->upload->max_width = 170;